*** empty log message ***

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b22e0a0aaa8ea913707447f86dc27e2485170577..9afc0d50035600b6bc4ccab0f3721e35744cfd22 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+       * Makefile.in (compile-files): Redirect output of chmod to
+       /dev/null.
+
 2001-05-10  Stefan Monnier  <monnier@cs.yale.edu>
 
        * smerge-mode.el (smerge-mode): Force font-lock-multiline to t.

diff --git a/src/ChangeLog b/src/ChangeLog
index e988f44aa66591b84cf90d121db2eb83a3300e2d..2ad1892a423846de351bb93942b649c8ddcd7089 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-11  Gerd Moellmann  <gerd@gnu.org>
+
+       * xfaces.c (try_alternative_families): New function.
+       (try_font_list): Use it.  If ATTRS specifies a family, check
+       fonts from that family first.
+       (choose_face_font): Remove code setting the family part of
+       the pattern to nil.
+
 2001-05-10  Gerd Moellmann  <gerd@gnu.org>
 
        * xdisp.c (try_window_id): Fix case of all changes before